From: Christian Marangi <ansuelsmth@gmail.com>
Date: Wed, 11 Jan 2023 15:21:11 +0000 (+0100)
Subject: github-merge-pr: add check for working on clean branch
X-Git-Url: http://git.openwrt.org/%22http:/oss.oetiker.ch/rrdtool//%22/%22http:/oss.oetiker.ch/rrdtool/%22?a=commitdiff_plain;h=fe709c1d4b5696729d66ea224f0c3494d2a0e98c;p=maintainer-tools.git

github-merge-pr: add check for working on clean branch

With error it may happen to work on a dirty branch and unintended
changes may be merged on merging a different pull request.

Add a check for it and exit with an error text.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---

diff --git a/github-merge-pr.sh b/github-merge-pr.sh
index f8758d3..f7325db 100755
--- a/github-merge-pr.sh
+++ b/github-merge-pr.sh
@@ -107,6 +107,11 @@ fi
 echo "Returning to $BRANCH"
 $GIT checkout $BRANCH
 
+if [ -n "$($GIT log origin/$BRANCH..HEAD)" ]; then
+	echo "Working on dirty branch for $BRANCH! Please reset $BRANCH to origin/$BRANCH" >&2
+	exit 10
+fi
+
 echo "Actually merging the PR #$PRID from branch $PR_USER/$PR_BRANCH"
 if ! $GIT merge --ff-only $PR_USER/$PR_BRANCH; then
 	echo "Failed to merge $PR_USER/$PR_BRANCH on $BRANCH" >&2